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

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



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