Merge "Fix issues with bubbles crashing/removing during expansion." into rvc-dev am: 7bf84ecb am: fc837819

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

Change-Id: I84beb17efc29346d4fd7dcaf37c0ca91eaceb5ae