[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: 7b0406196e -s ours
am: 94a7c3f1d5 -s ours
am skip reason: subject contains skip directive

Change-Id: I7a8b411d4f1fc258dc1ccb3a925cf8d449094db7