Merge "Fix VTS test for SupplicantStaNetwork::setGetEapPhase2Method()" into oc-dev