[automerger skipped] Merge "Migrate convertHalCellIdentityToCellIdentity()" am: b50e6ceeb0 am: eeaba5f024 am: a979de9f77 -s ours
am skip reason: Change-Id Icb532113b3a43c7feaab09d73e66caf9671f0b77 with SHA-1 7ee0704603 is in history

Change-Id: I5bffe854098f0681695c47294c49d455908eb85c