Merge "CS: remove tracker when disconnected" into main am: 9c96b0a0 am: 5d0a61f6

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



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