[automerger skipped] Added string token to CARD support multiple languages am:...

[automerger skipped] Added string token to CARD support multiple languages am: 87c10e7b -s ours am: dbf42d15 -s ours am: 7dbaaf4a -s ours am: 50ccc9cc -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: I60be4a0698c8fdd5ed36af750a8777f80fddb19b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>