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

am skip reason: Merged-In I7af1a4f941d009f05e3fc9dc667a035d19e87d62 with SHA-1 65da9766 is already in history

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

Change-Id: I3ed598434eb5e1b17ea76522b2d8a9ddfe8a6ba6