Merge "Fix service resolve on tethering downstreams" am: 5eaefa21bf

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

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