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

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

Change-Id: I87143f17132186dea7575318d0a4c28c4f3e924c