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