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