[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: Ie0caa8193b46bcd5f9eb83a857ff9bb16a323b76
This commit is contained in: