Merge "LeAudio: Remove redundant context type" am: f63afca9 am: a4d01e8e...

Merge "LeAudio: Remove redundant context type" am: f63afca9 am: a4d01e8e am: 81d880dd am: 4eede49a

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



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