[automerger skipped] Enabled x button for clearable silent Notif[s] am:...

[automerger skipped] Enabled x button for clearable silent Notif[s] am: 5e6673f9 am: 8ebb9d33 -s ours

am skip reason: Merged-In If55b0b7fc35bb6ece83878cf3db0d7abfc2a214a with SHA-1 32f85f8b is already in history

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

Change-Id: I6fe101191764375cfa5cc7063af392a43a762ffa