Merge "Don't set USER_FIXED when revoking a permission inside Settings -> App. am: f7d0ef9f74 am: 549ff21c21" into nyc-mr2-dev-plus-aosp