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