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

Change-Id: Id4a6de2cbfadba5cdfb5e2a53730928175193bbe