Merge "Remove CellLocation from RadioInfo" am: d2f6de9e22 am: db55a3c967

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1429308

Change-Id: I215b37ef07877a72ba2ff8dfca26c8a356d57f68