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

Change-Id: I3657e473a5c8ba45da7f1845ce860c0a494878f7
tree: 94ec78236475d8434fb384fb86cf20606ca85635
  1. core/
  2. services/
  3. tests/