[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a589e31259 -s ours am: e5b03889a1 -s ours am: 587aa366bc -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419942 Change-Id: I887513c6cbfe455d497c0e8b6c776c9f4190e5c1
This commit is contained in: