[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 199b0018ff -s ours am: 550e92d020 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684409 Change-Id: Ibf50492d1985909d6ab532e9f488ee9bdf3f9006
This commit is contained in: