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

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

Change-Id: Icdbf80b4fdc32b86dacb9963e7dfdc47429f9927