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

Change-Id: I4e9853aa8ee87ffa30f71c750115107b246de1bc