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