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

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

Change-Id: I5dc572f418dadf607f7bd6caa1c213d958aaf5f5