[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 86c9b34f9a -s ours am: 466d4a4e4e -s ours

am skip reason: Merged-In Id6910c32875b82e44020f6138e8e89b6a8bff4a4 with SHA-1 9996943d23 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mdnsresponder/+/16843710

Change-Id: If95d8e86a30a0b4c36cf7d81988aef2eaa9439ca