Merge "[Ravenwood] Use default socket timeout" into main am: c60b50c2 am: bc128520

Original change: https://android-review.googlesource.com/c/platform/build/+/3205392



Change-Id: I6dbf941d92097745e7a74bfaa3c06b1f023a0bcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>