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

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

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