Merge "Fix name of COO." into main

src/com/android/settings/RegulatoryInfoDisplayActivity.kt

@@ -69,6 +69,6 @@ class RegulatoryInfoDisplayActivity : Activity() {
     private fun getRegulatoryText(): CharSequence? {
         val regulatoryInfoText = resources.getText(R.string.regulatory_info_text)
         if (regulatoryInfoText.isNotBlank()) return regulatoryInfoText
-        return featureFactory.hardwareInfoFeatureProvider?.countryIfOriginLabel
+        return featureFactory.hardwareInfoFeatureProvider?.countryOfOriginLabel
     }
 }

src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoFeatureProvider.kt

@@ -27,5 +27,5 @@ interface HardwareInfoFeatureProvider {
     /**
      * The country of origin label.
      */
-    val countryIfOriginLabel: String
+    val countryOfOriginLabel: String
 }