[automerger skipped] [automerge] [manual merge] [DO NOT MERGE] Revert the "traffic stats log convert tp pcap" mechanism am: 70693fb15d 2p: 8a352cd0e9 am: 358462dab3 -s ours am: f0aaa0768c -s ours am: 905a5e21ce -s ours am: eceda74f8f -s ours am: d72c6e2706 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/21609528

Change-Id: I2773161365f491ff17c2521d2017406b0301a658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>