Merge "floss: Increase git timeout for container build" into main am: 6c3606d0 am: c2412a88

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3249314



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