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