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