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

Change-Id: Ie0e6e8abc4d09406761bbb14bf513bf2a4e22314