[automerger skipped] Merge "DO NOT MERGE revoke certain app-ops on suspend am: 873e19f63f am: 53ca466732 am: 16acbaac55" into qt-qpr1-dev-plus-aosp
am: 73775b6d8e -s ours
am skip reason: subject contains skip directive

Change-Id: Idf7bc0b6fe2f48fb8b1b7bfb6ec804cd40ffc468