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

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

Change-Id: Ifdefdcf81faa9c13961178cc99ed1362b7eb6815