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