Merge "Fix NetworkStatsApiTest failed on Q device" am: e694c0af am: 04b8094b am: 15f8a94c am: 8a73f6cf am: fbad3807 Change-Id: Id74e9e23bd06de4bca803b4c21b1883caeceab57