[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4f66623be8 -s ours am: 713b4f7e57 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15901610 Change-Id: Ie3cda1ec0e22c8eed025da9396524d78f6f244e8
This commit is contained in: