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: 116537e5

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

Change-Id: If1bc92fe16c9f6e089f014760b893043f253c55b