Merge "[Thread] fix upstream network selector to exclude VPN" into main am: 50644b75b8 am: 5daf5a8137

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

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