Merge "Fix flaky tests related to bluetooth browser media service." am:...

Merge "Fix flaky tests related to bluetooth browser media service." am: fd63f06b am: c604df94 am: cc555735 am: 710916b7 am: 4eda6542

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



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