[automerger skipped] Merge "Throw on revoked location permission - telephony"
am: 9b6ee67985  -s ours

Change-Id: If1c1ce94dd86f7eabae5e34b52e08890bba2b722