Merge "Revert "Check for location access on TelephonyRegistry""