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

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

Change-Id: Ibb7193c8b55af640cec2c0980ed04e9462197223