Merge "Revert "Don't show "Clear All" w/ redacted notifs"" into tm-dev am: 95d2e13c

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



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