Merge "Merge "DO NOT MERGE revoke certain app-ops on suspend" into qt-dev am: b0369528 am: 1e7e9248 am: 5918a560" into qt-qpr1-dev-plus-aosp