Merge "Don't set USER_FIXED when revoking a permission inside Settings -> App." into cw-f-dev am: d5b0cf6133 am: bf321f14af
am: 8b2e766411

Change-Id: Id378cc0ea22a411b311c1e6ed55d829c3ca1b284