Merge "Fix issues with bubbles crashing/removing during expansion." into...

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

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

Change-Id: I560630e2e9f69a75abc51c8a0e21afcaf906b79a