Merge "Catch AdbError during adb port forwarding to trigger retry mechanism in...

Merge "Catch AdbError during adb port forwarding to trigger retry mechanism in gd_device setup" am: 0f399252 am: 63a4ce5c am: ac6bded4 am: 48c9d27a am: 07862cf3 am: 6a7cb937

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



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