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

Change-Id: Ie0f5e005777a341d1823ba8b5888249fe05d4c2a