Merge "Fix the dot state for persisted bubbles & clean up labels" into rvc-dev am: f8b08dfa am: aaca11c5 am: 6e271504 am: 86b24981

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

Change-Id: I05600426015fc886c5e3640d78b572edd361f38b