Merge "Ensure all DatagramPackets with the same destination address" into main am: 51dc24ad0b am: 4fe99e8547

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

Change-Id: I196140acd9bcae5240da31f2a28ca86d6094375a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>