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

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



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