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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88 -s ours am: ea2310e0 -s ours am: 8ff2cfce -s ours am: 1ae472af -s ours

am skip reason: subject contains skip directive

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



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