[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 07587bd2f7 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684930

Change-Id: I681625098abbf7f198054efea311c3dadad3e797