[automerger skipped] Merge "Fix flaky test on ActiveDeviceManager" into...

[automerger skipped] Merge "Fix flaky test on ActiveDeviceManager" into tm-qpr-dev am: 262901f8 -s ours am: 06ea39a3 -s ours

am skip reason: Merged-In I8285dd829934fddf58af399301c2322634dba2f9 with SHA-1 dba9f0b6 is already in history

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



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