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

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

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