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

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

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