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 am: be574566 am: 7f190ea5

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

Change-Id: I77bfcccb04d3ce568d936545c8d1d8b6c456daab