Merge "Merge "Merge "Fix bubble shows empty content after rotating the...

Merge "Merge "Merge "Fix bubble shows empty content after rotating the device." into rvc-dev am: e8a51880 am: dacdf42b" into rvc-d1-dev-plus-aosp am: 2fb1cd38" into rvc-qpr-dev-plus-aosp am: eb0497eb

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

Change-Id: Ic5934af55deff5af567d5aa7c27aa3667325a959