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: c03b20a5 am: 2aa6b8eb am: 0a5351cb

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



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