[automerger skipped] DO NOT MERGE Set app op mode to allowed when granting permissions to reset state. am: ac743cb54e
am: c7643aad8f -s ours
am skip reason: subject contains skip directive

Change-Id: I37dd2bcf464178514bd97c6f63202a8288dd6766