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

Change-Id: Ieb881d46707c361fda4d1cb3abe23c648d25dbf9