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

am skip reason: subject contains skip directive

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

Change-Id: I63aad3dfab7083c8a084e244ce2ce2a17546b4fe