Merge "Expose the netd mock in CSTest to allow verifying calls on it" into main