[automerger skipped] Merge "VPN: fix crash on missing CCM" into...

[automerger skipped] Merge "VPN: fix crash on missing CCM" into android15-tests-dev am: 204bcfca -s ours am: 6e3861eb -s ours am: bb578a3e -s ours

am skip reason: Merged-In I2f08fb2fba667afa34f9951ff193bcb9d12683a6 with SHA-1 443980d0 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3377813



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