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

[automerger skipped] Merge "DO NOT MERGE Revert "Remove app ops indicators from notifications"" into rvc-qpr-dev am: 71f51c54 am: fb19e191 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I33ec74a189131b536e4fe549526acb2898ccb17d