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