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