[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 25b26f4cf9 -s ours am: c20b7bd70a -s ours

am skip reason: subject contains skip directive

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

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