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

Change-Id: I810830fba72cea805d63f16013aca896122ce48d