Merge "Remove app ops indicators from notifications" into rvc-qpr-dev am: 2659836775

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

Change-Id: I70c1dd2665b51c442484577f0077ad4bebc0577d