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

[automerger skipped] Added string token to CARD support multiple languages am: 33c9adca -s ours am: c59830b9 -s ours

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

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



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