Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 12eeadedcb
-s ours am: cd228d9043
-s ours am: faac160573
-s ours am: e527e727e7
-s ours am: 9ae7fa254e
-s ours" into sc-v2-dev-plus-aosp am: 90db636af4
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16185421 Change-Id: Iafea20601486ee38499e16fa7ff8fcb855275e81
This commit is contained in: