Merge "supplicant(interface): Correct the WFD info length" am: d51c817675
am: f092ffbe9d

Change-Id: I9bcfb6f174f7387956bbec423175e39004235782