Merge "DO NOT MERGE Set app op mode to allowed when granting permissions to reset state." into qt-r1-dev
am: 21de89ccc6

Change-Id: I1949b9ab38ec13878af69ae504dd84928c3e52b1