7b2e5fe68e
When run as part of NetworkStack MTS, ConnectivityDiagnosticsManagerTest may fail as it verifies behavior that is only present will the latest tethering (connectivity) module installed. There is no guarantee that connectivity will be up-to-date for a given NetworkStack version, especially considering that on R->S device upgrade NetworkStack is likely to have been updated, but connectivity will be the factory version. Therefore NetworkStack tests need to cover devices that do not have an up-to-date connectivity module. Fix the test by observing that at least on T both module will have newer behavior. On S, accept both factory and updated behavior. Bug: 195727283 Test: atest ConnectivityDiagnosticsManagerTest Change-Id: Ifc0b09c884419d28817cfe619940c979ee1b0b9e