Merge "Deprecate CellLocation#requestLocationUpdate" am: 277f52a0f4 am: 3153f5efb9 am: ad12e8d8b8

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

Change-Id: Ia3400cc40de7e29c8e7c35714ea0502a39ab7a1f