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

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

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

Change-Id: Iafd380327e74bc7d938b66e09d80e1f21877188b