Merge "[automerger skipped] Merge "Throw on revoked location permission - framework" am: bb67bab55f  -s ours am: af3c1fbef2  -s ours am: 0437633dae  -s ours am: 2e995e109a  -s ours"