[automerger skipped] DO NOT MERGE revoke certain app-ops on suspend am: 873e19f63f am: 53ca466732 am: 15c374d84b
am: 1ea52041e2 -s ours
am skip reason: subject contains skip directive

Change-Id: I10360b433b151fb2feceae1e21338bd656d5e5e7