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

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

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