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

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

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



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