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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5d6b6d6e -s ours am: 936515dc -s ours am: 8114968e -s ours am: 49820429 -s ours am: 1b322a6a -s ours

am skip reason: subject contains skip directive

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



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