Merge "Separate color into app color and dot color" into tm-dev am: d0362cf0...

Merge "Separate color into app color and dot color" into tm-dev am: d0362cf0 am: 5d5b134d am: 3a2960cc am: f2aefcca

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



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