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: aaca11c5 am: 6e271504

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

Change-Id: Ica6cd68fafc8d890d45a62b62bcab382dc7a0809