[automerger skipped] Merge "Bt: Add support for interop conf feature" am:...

[automerger skipped] Merge "Bt: Add support for interop conf feature" am: fca42b8f am: 660cbe74 -s ours am: 12b8ce87 -s ours

am skip reason: Merged-In I959ee79fe74d0b22a26b3df1633ee88670d396d1 with SHA-1 7ab958e4 is already in history

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



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