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

Change-Id: I7ba614a192b4aaaa36cc5cd7153cd654c1161505