Merge "Fix NetworkStatsApiTest failed on Q device" into rvc-dev am: e995acd2 am: 6df16e5c am: 5024143a Change-Id: Ia6dec1000faa05337d3eee4b4ad0eb632c1f2843