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

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

Change-Id: I9df11bb28ac6a9c27efee221e0319171827b2d73