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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b48d3cb1 -s ours am: 0673acc6 -s ours am: 22049b77 -s ours am: 8a15f694 -s ours am: 6246767c -s ours

am skip reason: subject contains skip directive

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



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