Merge "Fix unexpected closure of the bubble." into rvc-dev am: e3defa2d am: 07610a29 am: bb7f58e9 am: 61f00f4d

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

Change-Id: I4152b4ec2682ccab44b35c4574176451b8efb55c