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

[automerger skipped] Merge "Don't show "Clear All" w/ redacted notifs" into tm-dev am: e6e49467 am: 8204fbd5 -s ours am: e6ea7dc5 -s ours

am skip reason: Merged-In Ibc66576d28a48f7c82cad875ed2dcb57a7b23f10 with SHA-1 63122cbd is already in history

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



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