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

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



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