Merge "Remove obsolete solution for support ApfV6 opcode." into main am: 04658f72b0 am: e6224ab8b5

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

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