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