Merge "Migrate convertHalCellIdentityToCellIdentity()"
am: 3149662515

Change-Id: I282a6d05355037731c3851b20fc5b0a6a842df4b