Merge "Fix test flake on IpConnectivityLogTest" am: f6ebf58e am: 3b7fcbb9...

Merge "Fix test flake on IpConnectivityLogTest" am: f6ebf58e am: 3b7fcbb9 am: dfad204f am: e6168c66 am: 48ecbb1b

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



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