[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into...

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: b4ed7534 -s ours am: 89c0ca70 -s ours am: 71b35ea7 -s ours am: bec574b6 -s ours

am skip reason: subject contains skip directive

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



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