[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25b2bf59...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 25b2bf59 -s ours am: 7bb52006 -s ours

am skip reason: subject contains skip directive

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



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