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