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

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

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