[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 96719a61ab -s ours am: 23c7b00cf2 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15590939 Change-Id: I71143092efc46dc0124189f8bd0ff9596ce61397
This commit is contained in: