Merge "Deprecate TelephonyManager.getCellLocation()"