[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 18636927b7 -s ours am: 678227ea73 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15340037 Change-Id: Ia771b138518aea87f32ad16c21cd7e3bff5d9baa
This commit is contained in: