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 am: 97a8edc7

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

Change-Id: I011422f716b5b7fb38b9d32729817b4ab800a8cd