Merge "Floss: Disable three way call feature" into main am: 14c5f38c am: c7da85d3

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



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

system/btif/src/btif_hf.cc

@@ -152,9 +152,8 @@ static tBTA_SERVICE_MASK get_BTIF_HF_SERVICES() {
 /* HF features supported at runtime */
 static uint32_t get_hf_features() {
 #if TARGET_FLOSS
-#define DEFAULT_BTIF_HF_FEATURES                                               \
-  (BTA_AG_FEAT_3WAY | BTA_AG_FEAT_ECS | BTA_AG_FEAT_CODEC | BTA_AG_FEAT_UNAT | \
-   BTA_AG_FEAT_HF_IND)
+#define DEFAULT_BTIF_HF_FEATURES \
+  (BTA_AG_FEAT_ECS | BTA_AG_FEAT_CODEC | BTA_AG_FEAT_UNAT | BTA_AG_FEAT_HF_IND)
 #else
 #define DEFAULT_BTIF_HF_FEATURES                                  \
   (BTA_AG_FEAT_3WAY | BTA_AG_FEAT_ECNR | BTA_AG_FEAT_REJECT |     \