Merge "Merge "Revert "Check for location access on TelephonyRegistry"" am: 39393f889a am: 772d17c263 am: 07e1d78346"