[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 31f749d849 -s ours am: 18fc20466c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15598034 Change-Id: Iaaf362b7cd4e572ff4045441c3f3b170aca9abd4
This commit is contained in: