Merge "Fix testIkeOverUdpEncapSocket flakiness caused by cached ifaceStats" into main am: aa7b348c81 am: c16f18d6da

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

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