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

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

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



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