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