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