Merge "[automerger skipped] [automerged blank] Import translations. DO NOT...

Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f5 am: 011d462a -s ours am: 7a0b1e18 -s ours" into tm-d1-dev-plus-aosp am: b13d27ff -s ours

am skip reason: subject contains skip directive

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



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