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

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

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