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: 002496b1 -s ours am: 71eaa449 -s ours" into tm-qpr-dev-plus-aosp am: 91b0cd2e -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: I4a1574674e613a8ece0bfd2beabf7b96dd447d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>