Merge "Fix flaky test: testOnNetworkConnectivityReportedFalse" into main am: bda7d35533 am: 6002f71400 am: 4dabe74442 am: 9c88d10ce2

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

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