tree 52773f69a36b9c38f3855af25ff2e2d3722d2e80
parent 6392a72771fa75b989239d605e249514f2fd6172
parent 9b6ee67985744117d6275bd85a649e15ea1ac5ac
author Nathan Harold <nharold@google.com> 1533314863 -0700
committer android-build-merger <android-build-merger@google.com> 1533314863 -0700

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

Change-Id: If1c1ce94dd86f7eabae5e34b52e08890bba2b722