Merge "Fix flaky test: testOnNetworkConnectivityReportedFalse" into main