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

am skip reason: subject contains skip directive

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

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