Merge "Don't set USER_FIXED when revoking a permission inside Settings -> App." into cw-f-dev