Merge "wpa_supplicant(hidl): Correct the Wfd length" am: 1f0276019c
am: 1838b0343f

Change-Id: I89f54bf0eec28ec28d2c6eb6e813c6b4252e1c67