[automerger skipped] Merge "Remove app ops indicators from notifications" into...

[automerger skipped] Merge "Remove app ops indicators from notifications" into rvc-qpr-dev am: 26598367 am: d3dc8e79 -s ours

am skip reason: Change-Id I5b7514f765811ffd3b0aca63d0108591755974ab with SHA-1 3a72daad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12361488

Change-Id: Ie466aefe6d26e3892216def6413b0db36b5b7773