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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 95ed02d9 -s ours am: ec9202f0 -s ours am: 13ad0978 -s ours am: a8cece7b -s ours

am skip reason: subject contains skip directive

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



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