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

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

Change-Id: I778d7a2d309da0e65dacb9ae3532f00e5d222b32