Merge "Merge "Revert "Check for location access on TelephonyRegistry"" am: 39393f88 am: 772d17c2 am: 07e1d783"