[automerger skipped] Merge "[DO NOT MERGE] Fix tests in TrafficStatsTest that are affected by adb over network" into pie-cts-dev am: 2c4fd9ccab -s ours am: 00b0d87a2f -s ours am: 83601fc490 -s ours am: d8b7fbed3a -s ours am: 73c49b9c15 -s ours am: 6438d6a8d4 -s ours am: 453d5ddcb3 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/1580323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80c0ed8e375c589377375433ff40aff8bcc90a54