[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am:...

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: eb03425e -s ours am: b78dd82b -s ours am: cd624bbd -s ours am: f26b0b22 -s ours am: 522e35c4 -s ours am: 962a9976 -s ours

am skip reason: subject contains skip directive

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



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