Merge "Csip: Remove unused variable" am: 11b13834 am: c84d880b am:...

Merge "Csip: Remove unused variable" am: 11b13834 am: c84d880b am: ebbbaaef am: 3e61a35f am: dbb756de

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



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