Merge "PTS-bot: add default timeout and AVDTP tests" am: 0eabcc2f am:...

Merge "PTS-bot: add default timeout and AVDTP tests" am: 0eabcc2f am: c646e58d am: a6970930 am: 52724720

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



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