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

Change-Id: I14834c28abb17cdc0397950470e45f4e73462dff