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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: bdb5abdb -s ours am: d1741991 -s ours am: a246d26b -s ours am: 85eb7ca9 -s ours am: 6cd785a2 -s ours

am skip reason: subject contains skip directive

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



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