[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev
am: 0e8f1fa5e9 -s ours
am skip reason: subject contains skip directive

Change-Id: I53678027aa329651d6d6c9652aee847ee36b9b30