Merge "[PasspointV2] Set summary of saved networks preference" into qt-dev

diff --cc res/values/strings.xml
Simple merge

diff --cc src/com/android/settings/wifi/WifiSettings.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
index 2a90b90,e2dc932..d2e3566
--- 1/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
--- 2/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
@@@ -46,9 -48,9 +50,10 @@@ import com.android.settings.R
  import com.android.settings.datausage.DataUsagePreference;
  import com.android.settings.search.SearchIndexableRaw;
  import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
 +import com.android.settingslib.wifi.AccessPoint;
  import com.android.settingslib.wifi.WifiTracker;
  
+ import java.util.ArrayList;
  import org.junit.Before;
  import org.junit.Test;
  import org.junit.runner.RunWith;