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: 37b79de2 am: 1776d4e0

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

Change-Id: I4b2c768b50c09dd0fe77f7f21211fa091c70614f