[automerger skipped] Merge "Fix frozen notifications after bouncer dismissal"...

[automerger skipped] Merge "Fix frozen notifications after bouncer dismissal" into tm-dev am: 54102c21 am: b99f69ea -s ours

am skip reason: Merged-In I7af1a4f941d009f05e3fc9dc667a035d19e87d62 with SHA-1 91ed9131 is already in history

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

Change-Id: If1cc6d1772fcc1c81474880c0317e5273549dae4