Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4d7108812a -s ours am: a7da0b759a -s ours" into sc-v2-dev-plus-aosp am: 1bb15a2240 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15090203 Change-Id: I6ae6f61d46a9846008e6bac2ffc06be9ddf20e05
This commit is contained in: