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

Change-Id: I7e2fd26aad4c09bca97142279434fb108abae848