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

Merge "Merge "Fix bubble shows empty contents after rotating the device." into rvc-dev am: 35cd1a6a am: c06a5dab" into rvc-d1-dev-plus-aosp am: 0d878a3e am: 57ef164f

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

Change-Id: I072d4fe9c2def964a03011c0bae4bf08182ad36c