[automerger skipped] Merge "LeAudio: Remove redundant context type" into...

[automerger skipped] Merge "LeAudio: Remove redundant context type" into tm-qpr-dev am: a00ef6d7 -s ours am: f5221e5b -s ours

am skip reason: Merged-In Ibed8531d2692bb5eb834177f8b9ceb83aabf0dfa with SHA-1 04857bff is already in history

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



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