Merge "Don't diverge from upstream on a debug print" am: 2dcabed983 am: 9c76a2112a am: 0d4deaeaaf am: 9eca53a8c9

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

Change-Id: I40e3390d4789f24f2a27320df7d864389dc4b999