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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 980d88cc -s ours am: 3caf5ab6 -s ours" into tm-d1-dev-plus-aosp am: 1431470b -s ours

am skip reason: subject contains skip directive

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



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