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

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



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