Merge "Fix NetworkStatsApiTest failed on Q device" am: e694c0af58

Change-Id: I3657e473a5c8ba45da7f1845ce860c0a494878f7