Merge "leaudio: Minor refactor needed for future patch" am: 2157c0cb am:...

Merge "leaudio: Minor refactor needed for future patch" am: 2157c0cb am: 2893ffb3 am: 046de2e2

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



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