Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a5eb30b85f -s ours am: 157610ec33 -s ours" into sc-v2-dev-plus-aosp am: 93e647f843 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15130033 Change-Id: Ib8ced3f1e4c77523eb56fdc1cb4ee629797ab839
This commit is contained in: