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

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

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