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