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

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

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