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

Change-Id: Id2f2c868270d990f465b9d3948c235eef3544dc5