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