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

Change-Id: Ic13eacf7dafc96359bd607cb4e2a5c024f9bb607