This change ensures that all forms of transport-mode packets are correctly accounted for, and not double-counted. This includes both per-UID counters, as well as interface counters. Bug: 62994731 Test: CTS tests updated, passing Change-Id: I83be0724ac21d9db7d91ce72733d13fb6736e66e