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

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