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

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

Change-Id: I176c44373161c042bdf7d674fd515a920673e900