Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev