[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cd848e3454 -s ours am: 9213211efe -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15898569 Change-Id: I830ffe6bf97b6a4aa692ca10d3ba8fb860557d89
This commit is contained in: