Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd6f
am: 525000b2ab
am: 92d559063f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862 Change-Id: Iaa5af9f361aa09b601a532500be5a90c11946d24 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: