Merge "Deprecate CellLocation Classes" am: 27b3384102 am: b92bb8e643 am: 5d8e5249d6 am: febf87fde1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1429088

Change-Id: Ib97a5d6c10c47d7213c0a9a17ebcb0144079fdb5