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: fc837819 am: e50f8a42 am: 0818f9cc

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

Change-Id: I31147b33e6a9522b712b3f15a9d968c113de8ee8