Merge "supplicant(interface): Remove "wpa_supplicant"" am: 22373cb4b8
am: 8a7468c287

Change-Id: I50676ff6dc6dce30eb2b459077bea71a44c103ec