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