Merge "Fix replying to queries via unicast" into main am: 0c905a152e

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

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