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

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

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