E2E: Use evaluate to make sure the correct service type is always clicked
Created by: eseliger
Might fix known flakes with initial 120000ms setup timeout exceeded and sometimes failing creating the external service because the wrong form is selected for CodeCommit.