Merge "VPN: fix crash on missing CCM" into main am: 1692d8dc30

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

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