Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev
am: b036952896

Change-Id: Ieb5d9cc6e8aee976069c7ebd0b8d01db9982d886