[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 149512df23 -s ours am: 07171f20a8 -s ours am: de1d8dd1dd -s ours am: 87781f71d7 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16795498 Change-Id: Iecb36f8608e93e29b71d2cda7b0121542a128b52
This commit is contained in: