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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: e99ee5ce -s ours am: 0a161864 -s ours am: 3f02934e -s ours am: 97d4a17b -s ours am: 15db0829 -s ours

am skip reason: subject contains skip directive

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



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