[automerger skipped] hidl/1.2: Don't set WPA_KEY_MGMT_FT_SAE key management. am: bd90854778 -s ours am: 1fc679c6db am: e1c342dd09

Change-Id: I5116ebc0cfab44a2d0b010079e2027c8e47f7ad4