[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6cd9c53ce0 -s ours am: a0d0343d78 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17219361 Change-Id: Id0e7fbccc4e9493aaec358cc08e3be53a919f96a
This commit is contained in: