Merge "BpfCoordinatorTest: add testUpdateUpstreamNetworkState" am: 620c23af39 am: 8aff6e7600

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

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