[automerger skipped] Merge "LeAudio: Remove inconsistency in...

[automerger skipped] Merge "LeAudio: Remove inconsistency in BluetoothAdatper.getActiveDevices" into tm-qpr-dev am: ecb9382c am: 1bfbb237 -s ours

am skip reason: Merged-In I84a5d5871f20eed5ef0a07291c8c28787043d095 with SHA-1 7e35f013 is already in history

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



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