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