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