Merge "Merge "Fix bubble shows empty contents after rotating the device." into rvc-dev am: 35cd1a6a am: adf2eec8 am: 956d3460" into rvc-qpr-dev-plus-aosp am: 111a7bea

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

Change-Id: Ie48044e1f6b4bbabc3383028840e8cc73a72349b