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

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

Change-Id: Ic380c3cd3c41936ad278968081454cca6d3ee469