Merge "Fix some more empty bubble issues!" into rvc-dev am: aeb6e127 am: 695d36a6

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

Change-Id: I4cf3395f24e2441381fc0739f0cf830b8492cb34