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

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