automerge: 7e84d75 * commit '7e84d75c830b0ddaa499293723e427bca510dbaa': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
automerge: 7e84d75 * commit '7e84d75c830b0ddaa499293723e427bca510dbaa': Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue