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

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

Change-Id: Ife9a4cc207b0cc10e21150be13bfd7571184ddbd