[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 697d2e1fad
-s ours am: aa6dc66b38
-s ours am: b6d718e3e3
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12628378 Change-Id: Iede276e5053c63f855b8fcd8acbc87da2c9011e3
This commit is contained in: