[automerger skipped] Merge "Migrate convertHalCellIdentityToCellIdentity()" am: 3149662515 am: 5e93fbb847 am: 2b928f1c6a -s ours
am skip reason: Change-Id Ibf07f770b377c383ea0c4d3ef2d1d991a37854a9 with SHA-1 f55983a5d5 is in history

Change-Id: I6d689c08cc859318b4acf7118a024e406b78d6a5