Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 89d26124cb -s ours" into sc-v2-dev-plus-aosp am: 4a939b2233 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16712705 Change-Id: I6e29e9a9a4ae11ec68b5f16f4dcead1219ffd8a8
This commit is contained in: