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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 3b8cd1f0 -s ours am: d03d2cb5 -s ours am: 1b1bb79a -s ours am: 2af3ff71 -s ours am: 05bf6014 -s ours

am skip reason: subject contains skip directive

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



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