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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2835eb60 -s ours am: 1bb04f49 -s ours am: a6eb27d4 -s ours am: ea08f1a3 -s ours

am skip reason: subject contains skip directive

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



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