Merge changes from topic "niap-vpn" into qt-dev

* changes:
  Fix incorrect data type in netd bpf program
  Rename replaceUidsInMap, addMatch and removeMatch
  Block incoming non-VPN packets to apps under fully-routed VPN