Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev am: f8b08dfa

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

Change-Id: Ie0b2328dfc25a10b09edcec19f4fcc885e7addca