Merge "Csip: Remove unused variable" into tm-dev am: f8fad9d6 am: f6f15787

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



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