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