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