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