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