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

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

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

Change-Id: I95a169417c0ccce749b25a29a2a67328bd613d2e