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

Change-Id: I74a817ac04cc754a291521ae03fcf648b00494f9