[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: 781be73a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I15d21c97ef0f8dbfc63366c70d6b3c7e7153346d