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

Change-Id: I869564f41b79a048eb8578bb9ffe50dd3597120c