[automerger skipped] Merge "LeAudioService: Fix failing unit test" into...

[automerger skipped] Merge "LeAudioService: Fix failing unit test" into tm-qpr-dev am: 74fe8a27 -s ours am: 1f5a5b70 -s ours

am skip reason: Merged-In I1f87ab52bb57af1fe1e55c9d7613b851c013c25c with SHA-1 c6f6d5ee is already in history

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



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