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

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



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