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

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

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