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

Change-Id: I46259a86affb60f08acf93be3cc717c6b7232ac0