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

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

Change-Id: I21271a73a3aae3ef361788befbc683f082e275e6