Merge "Add test for IPv4 UDP forwarding rules in BPF map" am: dc62c75b1e am: bf671c1cd0

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

Change-Id: Ibf740113fac1796bd428f64b68f3c80768fef4a6