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