Merge "Check appOp in testWakefulnessAwake_AcquireCausesWakeup" into tm-dev