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

[automerger skipped] Merge "Revert^2 [Invisalign] Build changes to split out libbluetooth-core" am: bf15bee5 am: b44e8dbc -s ours

am skip reason: Merged-In If698c5a951043d877a05cf513d82c4d0e50de01b with SHA-1 91cac49d is already in history

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



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