[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: fad8ac95a4
-s ours am: ad7ea804d8
-s ours am: 6437b8590b
-s ours am: 73c95c1ac3
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16582001 Change-Id: Ibf7986578d4930b6c8b0d1a0298bdc795c12be39
This commit is contained in: