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

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



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