[automerger skipped] [manual merge] Import translations. DO NOT MERGE ANYWHERE...

[automerger skipped] [manual merge] Import translations. DO NOT MERGE ANYWHERE am: 7921912f -s ours am: d21a12be -s ours am: 181c85f9 -s ours

am skip reason: subject contains skip directive

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



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