[automerger skipped] Merge "Use Parcelable CellIdentity instead of CellLocation in AIDL." am: 9bda007cb8 am: a881005317 am: a6110193f8 -s ours
am skip reason: Change-Id I6225f100953a2ad354acaa261a774989926393ce with SHA-1 d75f97d21e is in history

Change-Id: I38d6107ce6da86d5fb9d53c3dbcdb7f7293b17e2