[automerger skipped] csis: Fix failing test_set_desired_size am: ef3d96d8 -s...

[automerger skipped] csis: Fix failing test_set_desired_size am: ef3d96d8 -s ours am: 60e376d9 -s ours

am skip reason: Merged-In I34a42966f3457f98331fccfc933f64441de26ca5 with SHA-1 936a36b0 is already in history

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



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