Merge "wpa_supplicant(hidl): Fix WPS method string" am: 2c3933c673 am: df4f38a6a2
am: c0ebf015cf

Change-Id: Id8015c0611bcbce5d2e7f8a436993d2a969ee8a2