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

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9257e588 -s ours am: a87c5a56 -s ours am: b3eb862b -s ours" into tm-qpr-dev-plus-aosp am: e36e9757 -s ours

am skip reason: subject contains skip directive

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



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