Merge "Fix Flaky testTrafficStatsForLocalhost" into android14-tests-dev