[fenix] For https://github.com/mozilla-mobile/fenix/issues/25846: Save the City field in addresses.

app/src/main/java/org/mozilla/fenix/settings/address/view/AddressEditorView.kt

@@ -93,7 +93,7 @@ class AddressEditorView(
             organization = "",
             streetAddress = binding.streetAddressInput.text.toString(),
             addressLevel3 = "",
-            addressLevel2 = "",
+            addressLevel2 = binding.cityInput.text.toString(),
             addressLevel1 = binding.subregionDropDown.selectedItem.toString(),
             postalCode = binding.zipInput.text.toString(),
             country = binding.countryDropDown.selectedItem.toString().toCountryCode(),

app/src/test/java/org/mozilla/fenix/settings/address/AddressEditorViewTest.kt

@@ -74,7 +74,7 @@ class AddressEditorViewTest {
             organization = "",
             streetAddress = address.streetAddress,
             addressLevel3 = "",
-            addressLevel2 = "",
+            addressLevel2 = address.addressLevel2,
             addressLevel1 = address.addressLevel1,
             postalCode = address.postalCode,
             country = address.country,