Merge "[automerger skipped] Merge "Throw on revoked location permission - framework" am: bb67bab5 -s ours am: af3c1fbe -s ours am: 0437633d -s ours am: 2e995e10 -s ours"