Merge "Merge "Don't set USER_FIXED when revoking a permission inside Settings...
Merge "Merge "Don't set USER_FIXED when revoking a permission inside Settings -> App." into cw-f-dev am: d5b0cf61 am: 0cf14a73" into nyc-mr2-dev-plus-aosp
am: 6e780a79
Change-Id: Ifa74e10379282aa6db2fabf4fb3678352b8c11dc