[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6aca88cb98 -s ours am: aa9494a0f7 -s ours am: 5c7f3e29bf -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1755811 Change-Id: Id13472860006b3e1f9d72b1a6daccdd4bf31b535
This commit is contained in: