[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1ee47eedbd -s ours am: 954cc41de5 -s ours am: 08540dce60 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17352637 Change-Id: I62405dca44b3f476e3b93192ef2178f233cbf1f2
This commit is contained in: