[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c689794...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1c689794 -s ours am: b1ff683b -s ours

am skip reason: subject contains skip directive

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



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