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