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

Change-Id: Iada21760551959e96210bf2f1807f24bc6d82be7
tree: 9dffae53d4a27e78cab30dc0736dd87d6a8b652f
  1. tests/