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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 135220df -s ours am: 230d16fe -s ours am: 234f5545 -s ours

am skip reason: subject contains skip directive

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



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