[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 skip reason: subject contains skip directive

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



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