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

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

Change-Id: Icd827793a1f0643860b5c883b5fdb3d607f76bdc