Merge "GD Cert: Change default timeout to 30s" am: 8cb66623 am: ef49f931...

Merge "GD Cert: Change default timeout to 30s" am: 8cb66623 am: ef49f931 am: 6eb37a2d am: e13bab5c am: e9d0c5ac am: c0079e5a

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



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