[automerger skipped] Merge "Added string token to CARD support multiple...

[automerger skipped] Merge "Added string token to CARD support multiple languages" am: 1c46ad7d -s ours am: 9392e582 -s ours am: b4fe928b -s ours am: ec71863d -s ours

am skip reason: Merged-In I90551b705381bee71df837b05bb0f3ff7ea98e54 with SHA-1 8269f703 is already in history

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



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