Merge "Add tethering IPv4 UDP forwarding test" am: 76bc75f0a2 am: 8003834727

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

Change-Id: I2939057dfd9459e554846cf2239effba7d9bd2b6