Merge changes Ie32ee0a8,I66c08e68 into main am: 7ae223e7de am: 8b0994c5f8

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

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