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: I0c2142da15c68090a5bb5bea66636991daa1ef8e