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

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

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