Merge "Remove NetworkShimImpl mock in TcpSocketTrackerTest"