Merge "Fix some more empty bubble issues!" into rvc-dev am: aeb6e12780 am: a01d41d37d

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

Change-Id: Id83ae0f9fecd6ea08fb244fa9f129bd6f2e72aec