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

Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f am: c0eaec80 -s ours" into sc-qpr1-dev-plus-aosp am: ebb11f1e -s ours am: 01214049 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I55f90925673555e2cc6ebec1eeb5befcc74d519f