[automerger skipped] Merge "Revert "Don't show "Clear All" w/ redacted...

[automerger skipped] Merge "Revert "Don't show "Clear All" w/ redacted notifs"" into tm-dev am: 95d2e13c am: 8cd9a061 -s ours am: f4c11c86 -s ours am: 5cc5635a -s ours

am skip reason: Merged-In Ie7469cb568471f4739a8c591ccc6d669895a8315 with SHA-1 03f5e4c4 is already in history

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



Change-Id: I96c6836120cec5b361b3b3a57b0044089b4a4192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>