[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8bdd0954c -s ours am: 0485ac6bc1 -s ours am: 325746ce39 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15375712 Change-Id: I55bac62d33fa577b44304247a54fdb0c9bcf2de9
This commit is contained in: