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