[automerger skipped] Merge "Revert^4 [Invisalign] Build changes to split out...

[automerger skipped] Merge "Revert^4 [Invisalign] Build changes to split out libbluetooth-core" am: 893ab432 am: bb2246dc -s ours

am skip reason: Merged-In If698c5a951043d877a05cf513d82c4d0e50de01b with SHA-1 204942db is already in history

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



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