[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 77cb3451ec -s ours am: fbab183425 -s ours am: cfdc992060 -s ours am: e5ddba6423 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1943423 Change-Id: I57c98aef8ca75db7b0131eb827e6b9082826fed5
This commit is contained in: