Merge "Bass: Fix removing pending source operation by timeout" into main am:...

Merge "Bass: Fix removing pending source operation by timeout" into main am: cea2fd1e am: 428f0f65

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



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