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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2f3499c5 -s ours am: c6eeba23 -s ours am: 7b661dba -s ours am: ab349ef3 -s ours am: e779551c -s ours

am skip reason: subject contains skip directive

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



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