Merge cherrypicks of ['googleplex-android-review.googlesource.com/30809393'] into 25Q1-release.

Change-Id: I7b0e0957a65589b018fd28b48deb882bcc4e332a

halimpl/hal/phNxpUciHal.h

diff --git a/halimpl/hal/phNxpUciHal.h b/halimpl/hal/phNxpUciHal.h
index c47a4f4..e7c0f7b 100644
--- a/halimpl/hal/phNxpUciHal.h
+++ b/halimpl/hal/phNxpUciHal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 NXP
+ * Copyright 2012-2023 NXP
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,7 +71,6 @@
 
 #define FW_BOOT_MODE_PARAM_ID 0x63
 
-#define SYNC_CODE_INDEX_BITMASKING 0xA1
 #define CCC_SUPPORTED_PROTOCOL_VERSIONS_ID 0xA4
 
 /* Low power mode */

halimpl/hal/phNxpUciHal_ext.cc

diff --git a/halimpl/hal/phNxpUciHal_ext.cc b/halimpl/hal/phNxpUciHal_ext.cc
index df007ab..6b8975f 100644
--- a/halimpl/hal/phNxpUciHal_ext.cc
+++ b/halimpl/hal/phNxpUciHal_ext.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019, 2022-2024 NXP
+ * Copyright 2012-2019, 2022-2023 NXP
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -973,12 +973,6 @@
     std::swap(it->second[0], it->second[1]);
   }
 
-  // Byteorder of SYNC_CODE_INDEX_BITMASKING
-  it = tlvs.find(SYNC_CODE_INDEX_BITMASKING);
-  if (it != tlvs.end() && it->second.size() == 4) {
-    std::reverse(it->second.begin(), it->second.end());
-  }
-
   // Append UWB_VENDOR_CAPABILITY from configuration files
   {
     std::array<uint8_t, NXP_MAX_CONFIG_STRING_LEN> buffer;