DO NOT MERGE revoke certain app-ops on suspend am: 873e19f63f
am: 53ca466732

Change-Id: I5f7456bc746affacbb949a9883484dfb8aaf7234