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

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



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