Merge "VPN: fix crash on missing CCM" into android15-tests-dev