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

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

Change-Id: I44aa4092ba064e41f92e560b07d1c5c417bc7342