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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c52abcd3 -s ours am: c9c69ea3 -s ours am: 9367464e -s ours" into udc-qpr-dev-plus-aosp am: 8b4a3739 -s ours

am skip reason: subject contains skip directive

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



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