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