Merge "Fix bubble shows empty content after rotating the device." into rvc-dev am: e8a51880b5 am: 32f4fcdf74

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

Change-Id: I94dfa13ebafec39741ccc1079763bede17b46927