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

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

Change-Id: Iffbbf82531881e0d3c7fec72e890613976fa8f23