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

Change-Id: I2447a90e4935e53fc0d55510bb50938fdaea23fa