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

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



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