[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into...

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 97773a0f -s ours am: 22025865 -s ours am: 4bcf6f05 -s ours am: 3f8ec845 -s ours

am skip reason: subject contains skip directive

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



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