[automerger skipped] [automerge] [manual merge] [DO NOT MERGE] Revert the...

[automerger skipped] [automerge] [manual merge] [DO NOT MERGE] Revert the "traffic stats log convert tp pcap" mechanism am: 70693fb1 2p: 8a352cd0 am: 358462da -s ours am: f0aaa076 -s ours am: 905a5e21 -s ours am: eceda74f -s ours

am skip reason: subject contains skip directive

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



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