Merge "Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue"