Merge "Fix NullPointerException in Ikev2VpnTest for watches" into android15-tests-dev am: de32aa8b11

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

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