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