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

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

am skip reason: Merged-In I17a5444d6c21b9a109b6c9a308d367a4503f5fdc with SHA-1 2e72e946 is already in history

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



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