Revert "NetBpfLoad: disable mainline on < U QPR3"

This reverts commit 4b28336a7a35df561511b2124bca1a817daa9426.

Fixed trivial comment conflicts in netd/BpfHandler.cpp

This is targetting mainline release M-2024-09.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I048af33789590dda4e1f0be0660419ca6b3ad57f
7 files changed