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

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

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