Merge "Remove CellLocation from RadioInfo" am: d2f6de9e22 am: db55a3c967 am: dfbf3927bd am: 84439e3340 am: 1905b8ed93

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

Change-Id: I75038c93e806596afda8fcc50c6fedb0fcbf7ddf