[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 947c792f...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 947c792f -s ours am: 479b63c1 -s ours

am skip reason: subject contains skip directive

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



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