[automerger skipped] Merge "Merge "Auto-expand bubble for priority notif" into...

[automerger skipped] Merge "Merge "Auto-expand bubble for priority notif" into rvc-dev am: d0ab0bbf am: d2f273c3" into rvc-d1-dev-plus-aosp am: 17057c3e -s ours

am skip reason: Change-Id I9f6104d88693144d7e247c05a6a41ed216d0eef0 with SHA-1 b5397972 is in history

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

Change-Id: I42b5073beeeaebdf32deb526d954c94245175d69