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

Merge "Merge "Fix issues with bubbles crashing/removing during expansion." into rvc-dev am: 7bf84ecb am: 45b21261 am: 97a8edc7" into rvc-qpr-dev-plus-aosp am: b2ecdf72

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

Change-Id: I941b5667202f18583512ece34f430f7710ea34ac