[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev...

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 588dae08 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iece47c4545f25ac5b3cfa39c00186bf1f135d043