Merge "Deprecate CellLocation Classes" am: 27b3384102 am: b92bb8e643

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

Change-Id: I06610c58d489d894f6211f9b1b56c3f5d365f7ba