Merge "Allow activated dots to keep their activated size" into main am: d9f2e2fb00 am: d8f1e31bb4

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

Change-Id: If9b407fc0b35ec278cfc9507968a839c77c27d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>