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

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

Change-Id: I05f6ac9c9979dd12c007afb517e05baa57c4c2c5