Merge "Accumulative fixes for LE audio test app" am: f4eff67b am: c9e24683 am: 99572b95

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



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