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: Ic356abf87fc92ef8946142198042c347c4e8d05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>