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

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



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