Merge "Fixed flaky testRoamingPhoneTypeSwitch"