[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 038a340e67 -s ours am: db2e0a0683 -s ours am: 2db40b6f22 -s ours am: 9119880f6c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16793875 Change-Id: I801ebc6b378aeb5cd754214df1a507e23d66bde9
This commit is contained in: