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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 6e09fd41 -s ours am: 9a1baa13 -s ours am: 9cf61414 -s ours am: 9758ba30 -s ours am: 69652dd4 -s ours am: 81d61791 -s ours

am skip reason: subject contains skip directive

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



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