[automerger skipped] Merge "Throw on revoked location permission - framework" am: bb67bab5 -s ours am: af3c1fbe -s ours Change-Id: Id5276b7479446825b50995ca894b4d112003ca9b