Merge "[Invisalign2] cleanup headers in smp" into main am: 4f02634a

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



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