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