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

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

Change-Id: Iae323ada9dde37a7b23b390b3b55aca6b9d2980a