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

Change-Id: I416a941d9cb539c9277249ca96f6ab81c4e3204c