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 am: 286e3e1b

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

Change-Id: I1af1f44e0f2bb36441e1620d4573d579e8b3a07b