Merge "Improve tests for notifyIfacesChangedForNetworkStats."