Fix service resolve on tethering downstreams am: 0102c9440a am: 13f6eb9aed

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

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