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

Change-Id: I566ad0495ae7de26ccccd91be959636712292de9