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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 48e0d38c -s ours am: b4d6138a -s ours am: ef81ebe1 -s ours am: a9987d7e -s ours am: 7ba7e265 -s ours

am skip reason: subject contains skip directive

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



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