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