Merge "Merge "Check for location access on TelephonyRegistry" am: 31230bb193 am: f581580fdb am: 9b31dd86da"