[automerger skipped] DO NOT MERGE Revert "Remove app ops indicators from...

[automerger skipped] DO NOT MERGE Revert "Remove app ops indicators from notifications" am: 8ec5bcb3 am: 125d1725 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6e854eb6a45dca20a89b757546e66c94bc57136a