Merge "Check for location access on TelephonyRegistry"
am: 31230bb193

Change-Id: I6827b337d9bcc2c634d873e03895c5997cca374c