Merge "Check for location access on TelephonyRegistry" am: 871202da2f
am: cf59665a75

Change-Id: I8eee8b62f0e41fa7346126d29266dfd555550028