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