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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 74549ba9 -s ours am: 1a479ad7 -s ours am: 5ad799df -s ours am: 64332e58 -s ours am: 3d0721de -s ours

am skip reason: subject contains skip directive

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



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