[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 939f6eed12 -s ours am: 8667f5efee -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2326123

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