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