Merge "DO NOT MERGE revoke certain app-ops on suspend" into pi-dev