[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 1cdb57b79a -s ours am: cce78f1da7 -s ours am: 2d8b962698 -s ours am: 2f25639357 -s ours am: f867f48e55 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086566 Change-Id: I945def64d4d8dd88626c03ae7d7179cd09062726
This commit is contained in: