Merge "Fix VTS test for SupplicantStaNetwork::setGetEapPhase2Method()" into oc-dev am: 3d56bdfb2e
am: b3782bab33

Change-Id: Idfddc917bbcb62c4f40513d018fb18f2e6aed618