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

[automerger skipped] Merge "Auto-expand bubble for priority notif" into rvc-dev am: d0ab0bbf am: 86f6e9a5 am: c60cd80e am: 6f910e8a -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: I57ffe1372781e8b91574b291df3973c2d1a646a9