Merge changes Ibe285aef,I318df93e into main

* changes:
  NetBpfLoad: disable mainline on < U QPR3
  NetBpfLoad: on aosp/main bump version from U QPR3 to V