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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a9ed172c -s ours am: d88fd5ae -s ours am: f1d4b7c9 -s ours am: 46e87937 -s ours

am skip reason: subject contains skip directive

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



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