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: bf321f14" into nyc-mr2-dev-plus-aosp
am: 68ca4547
Change-Id: If807f49af113f152ff03aaa35d767659fcab0c78