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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6d67ba76 -s ours am: 83a8804c -s ours am: 1abed789 -s ours am: 3edc9aa3 -s ours am: 0d71c507 -s ours

am skip reason: subject contains skip directive

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



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