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