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