Merge "Bass: Fix accessing null reference" am: 85903771 am: 6281c82d am:...

Merge "Bass: Fix accessing null reference" am: 85903771 am: 6281c82d am: c8c0c13f am: d11087c6

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



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