Merge "Use Parcelable CellIdentity instead of CellLocation in AIDL."
am: b148638aaf

Change-Id: I8532880c47c247196871f5438d1bcee3f1e712e1