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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 024f59ef -s ours am: 7f835fd2 -s ours am: df4ef857 -s ours am: c91e521b -s ours am: 8f1f6f24 -s ours

am skip reason: subject contains skip directive

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



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