Merge "Fix NetworkProviderSettingsTest#onWifiEntriesChanged" into main