Merge "[Passpoint] Fix broken test: com.android.settings.wifi.WifiSettingsTest"