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

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

Change-Id: Icf690ead90a4e1faac5f833ec77e5a5bca3fc49a