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

[automerger skipped] Merge "Added string token to CARD support multiple languages" into tm-qpr-dev-plus-aosp am: f32f79e0 -s ours am: f265a8c5 -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: I038b5c2186ae34ce4012df846048543fadd978fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>