[automerger skipped] Merge "Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev am: b036952896 am: 1e7e924881 am: 5918a560d1" into qt-qpr1-dev-plus-aosp
am: f5425a61c6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibfa270ba01cf763a4dec6c013a31b24f3d055650