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

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



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