Merge changes from topic "revert-26533062-Supplicant_merge_June24-CUATTSRBBR" into main

* changes:
  Revert "[wpa_supplicant] cumilative patch from commit 3a5d1a7e6"
  Revert "[wpa_supplicant] cumilative patch from commit 4b755c967"