Merge "Update TRANS opcode in ApfGenerator for discard/transmit buffer" into main am: f80fff8000 am: 956c0dc383

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2870061

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