This could potentially still leave cell data enabled because `connect_to_network` may enable cell data depending upon local setUp.

I think you should copy the block of code from gaia_test.py from lines 459-467 as that will definitely disable both.