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

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

Change-Id: Ie8f434d528422bbd71f100acb451a0bd8c506bdd