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

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

Change-Id: Id8f5673302a0f403868b680b290c975fda55e94e