Merge "Merge "Check for location access on TelephonyRegistry" am: 31230bb1 am: f581580f am: 9b31dd86"