Merge "Never read device flag values in ConnectivityServiceTest." into main