Added changes to handle Legacy FT test cases. am: eaaf04ea4f am: b1d062247f am: 4e573f6aa0

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/15066394

Change-Id: I080ab4869558e5afcbfa0ed44ee5ec5413704ed9