[automerger skipped] Merge "Update lockscreen shortcuts color tokens" into...

[automerger skipped] Merge "Update lockscreen shortcuts color tokens" into udc-dev am: 0d734038 am: cb2ea52b am: e665ea05 -s ours am: 026e7b6e -s ours

am skip reason: Merged-In I17a5444d6c21b9a109b6c9a308d367a4503f5fdc with SHA-1 4a661b75 is already in history

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



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