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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0d7f8ceb -s ours am: 3cf5a960 -s ours am: 2188cdc9 -s ours am: 487a0f6e -s ours

am skip reason: subject contains skip directive

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



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