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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f2088e37 -s ours am: 0b0a96a8 -s ours am: 212072e9 -s ours am: cf8b048a -s ours am: 5e942f10 -s ours

am skip reason: subject contains skip directive

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



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