Merge "BT: Make Bluetooth HCI VTS tests more stable"