Stop calling newFromNumber using an EntityId in ChangeOpsMerge

Bug: 63278
Change-Id: I6c3c83d7e3a63c19020ada89c628b2f47db1cfad
Merge "Stop calling newFromNumber using an EntityId in ChangeOpsMerge"