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