[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 60b7757fb4 -s ours am: 6f7ecf32e5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600807 Change-Id: I964beac164ff21f85b145a8f953201c87a54f0a7
This commit is contained in: