Merge "BpfCoordinatorTest: add testUpdateUpstreamNetworkState" am: 620c23af39 am: 3c7b1431f8

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

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