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