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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bb -s ours am: 19ea488d -s ours am: 541b8bc1 -s ours am: ff8249a4 -s ours" into tm-qpr-dev-plus-aosp am: 5648d422 -s ours

am skip reason: subject contains skip directive

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



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