[automerger skipped] Merge "DO NOT MERGE Set app op mode to allowed when...
[automerger skipped] Merge "DO NOT MERGE Set app op mode to allowed when granting permissions to reset state." into qt-r1-dev am: 21de89cc
am: 5534e979 -s ours
am skip reason: subject contains skip directive
Change-Id: I0c2cdcd303e3b0611e3c96a7ab5c201a04f11cde