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

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

Change-Id: I1ed7e12ce87c16e3a30f414e0818b6c9a3f87a55