Merge "Revert: Prevent auto-granting of location permission via DPM"