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

am skip reason: subject contains skip directive

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



Change-Id: I3c0708f41260c06d4035d9674289ccac2a54363e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>