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

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

Change-Id: I5578c6535d2d13e819e492661b139f3884703981