[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 80cca06027 -s ours am: a78ee12818 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684412 Change-Id: Id7c733b7e4058e73b068a01330ec2db9a7674efa
This commit is contained in: