Merge "Deprecate TelephonyManager.getCellLocation()" into oc-dev