Merge "Fix NetworkStatsApiTest failed on Q device"