Merge "Deprecate TelephonyManager.getCellLocation()"
am: bc0f610b25

Change-Id: Ic6f55f3f00b608f3b8c3212b0dea1114250ec1fe