Merge "Floss: Increase the stack start timeout to 12 seconds" into main am:...

Merge "Floss: Increase the stack start timeout to 12 seconds" into main am: eaf46219 am: 57628423

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



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