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