Merge "csis: Fix failing test_set_desired_size" into tm-qpr-dev am: 748feaaa

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



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