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: f38cb395

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

Change-Id: I9eb5c8f5be7a9764654684561db0a9b21d53051e