[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 75afb515a1 -s ours am: de186d7ee7 -s ours am: 81c4852c32 -s ours am: 2d5c0c6791 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15935603 Change-Id: Id29f663d5eda7d288ca8a2b1e57e0e02ad20f2d5
This commit is contained in: