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

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

Change-Id: I1bc213a0517c854ae052c51728aa7e259ac37185