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