Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41cfb6e3 -s ours" into udc-dev am: 4c0ef865 -s ours am: 64a68a76 -s ours

am skip reason: subject contains skip directive

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



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