Merge "DO NOT MERGE revoke certain app-ops on suspend am: 873e19f6 am: 53ca4667 am: 16acbaac" into qt-qpr1-dev-plus-aosp