Merge "Fix bubble shows empty content after rotating the device." into rvc-dev am: e8a51880b5

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

Change-Id: Ia32bb72e7175af56e20e0ad74aea53522894e6fb