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

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

Change-Id: I98f65fa33a5ec79e54233c1f05e6d9c2c4c66c9d