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

Change-Id: Ib09287a80e7fb68ac5e2533d3858120561cee6e0