Merge "DO NOT MERGE Revert "Remove app ops indicators from notifications"" into rvc-qpr-dev am: 71f51c54cd

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

Change-Id: I866d9b7cf4b04a57e08b65fd3dc4f6399aba3f5a