Merge "Fix tests in TrafficStatsTest that are affected by adb over network" am: 553872fc04
am: 1e68a61016

Change-Id: I3ca1e795546d9991f7c0a10d98cd9c6abd929ff4
tree: 4d6fa880992e525e58cf48d19666c9713ca354ea
  1. tests/