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