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