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