Merge "Merge "Fix unexpected closure of the bubble." into rvc-dev am: e3defa2d am: 79591d10" into rvc-d1-dev-plus-aosp am: d24d5729 am: 5f7427e9

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

Change-Id: Ie53f8bded50545e28b3c71981143a8dfe4963055