Merge "Separate color into app color and dot color" into tm-dev am: d0362cf0f5 am: c03b20a5a3 am: 2aa6b8eb32
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186411 Change-Id: Ia0496fc51aefea65037ee72569343078f37d05f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: