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 am: 240ee8ac

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



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