Merge "Handle non-visually-interruptive updates better in bubbles" into rvc-qpr-dev am: abeb577396 am: 7c0b511fbc

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

Change-Id: If352174bc05a314492a1e68c02b02eb135d786b4