[automerger skipped] Merge "Revert "Revert^2 [Invisalign] Build changes to...

[automerger skipped] Merge "Revert "Revert^2 [Invisalign] Build changes to split out libbluetooth-core"" am: 8275c7a5 am: 78beb4d6 -s ours

am skip reason: Merged-In If698c5a951043d877a05cf513d82c4d0e50de01b with SHA-1 91cac49d is already in history. Merged-In was found from reverted change.

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

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



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