[automerger skipped] Merge "Use Parcelable CellIdentity instead of CellLocation in AIDL." am: 4f42d17a am: 87b6d7b2 am: df51f1fd -s ours
am skip reason: Change-Id I029ad5301d59f904923c8a691b6d5fdf47e96b71 with SHA-1 0f801dec is in history
Change-Id: I494c0ecb63790fdffd320d0b674d6f05c7c4b200