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

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

Change-Id: Id84947b8335952327b2d22d1185f6d445a61e0d7