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

Change-Id: If9989e10138a4fe923439c919807ca745d616043