Merge "Fix flaky test: testOnNetworkConnectivityReportedFalse" into main am: bda7d35533

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

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