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

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

Change-Id: I3804f270dbe9707ef70e8b6c43675e45fac6c0e6