Merge "Remove CellLocation from RadioInfo" am: d2f6de9e22

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

Change-Id: Ibc8a489e438c121d3e7f3e7b900c8329de70c44d