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

Change-Id: I9487bfaf93255ca485ce8eacf940cc9748b39859