Merge "Fix testGetAllNetworkStateSnapshots for non-cellular"