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

am skip reason: subject contains skip directive

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

Change-Id: I8db57950d1f5b21380861fdcad717db985bdb89f