Merge "Floss: Increase timeout for handle_sigterm" am: 12340c0a am: acac5626

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



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