Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" into sc-dev