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

[automerger skipped] Merge "Added string token to CARD support multiple languages" into stage-aosp-master am: a92c7529 -s ours

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

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



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