[automerger skipped] Merge "csis: Fix failing test_set_desired_size" into...

[automerger skipped] Merge "csis: Fix failing test_set_desired_size" into tm-qpr-dev am: 748feaaa -s ours am: 055f3d2f -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: I919543a1e4a3c4a78ece7abc3dd0355c2cc1ac51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>