Merge "[Invisalign2] clean headers in csis_client.cc" into main am: 7aa37fc7...

Merge "[Invisalign2] clean headers in csis_client.cc" into main am: 7aa37fc7 am: ef6841aa am: 6dea9819

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



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