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

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

Change-Id: I0771c19497a91f456a435284af15e4614bc16f71