[automerger skipped] Merge "Refactor the InetSocketAddress in MulticastPacketReader to use port zero" into tm-mainline-prod am: d0ff31dbc0 -s ours am: 994682cc58 -s ours

am skip reason: Merged-In Idb9d8a96e1f10eb2ede972125430c84af6b539d9 with SHA-1 b9b1d0a9e8 is already in history

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

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