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

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

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