[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 skip reason: change_id Ie95555856afdd56728125f7e60b6a78cf9fc0e58 with SHA1 873e19f63f is in history

Change-Id: I19af5ee7f83feb9790ecff4a65972432248e390e