[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev am: b036952896 am: 1e7e924881 am: bc34cefb47
am: 31705030b5 -s ours
am skip reason: subject contains skip directive

Change-Id: I903ffa978b34aa7c8da7ce5a71612ea3c59bb060