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

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

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

Change-Id: Iaf12b79d959bcc1f9845c349f77e85c33c4b604b