Merge "Migrate convertHalCellIdentityToCellIdentity()" am: 3149662515 am: 5e93fbb847

Change-Id: I262148c395993ca9ecca7ee80e971d9e1854356d