Merge "[UI][Modifier key remapping] Use new color token." into udc-dev am: 59461ffd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22834862



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