Merge "DO NOT MERGE revoke certain app-ops on suspend am: 873e19f63f am: 53ca466732 am: 16acbaac55" into qt-qpr1-dev-plus-aosp