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

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

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

Change-Id: I32475f50168151354a31a6193bfaca166cea7e00