Merge "Bass: Multiple improvements and minor fixes" am: af8615ec am: 39ae014a am: ddac8147 am: 05734c9a

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



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