Merge changes from topic "am-1feffb280b5742faa39e6dbb1cd44aa8" into main

* changes:
  [automerger skipped] Merge "VPN: fix crash on missing CCM" into android15-tests-dev am: 204bcfcadb -s ours
  [automerger skipped] VPN: fix crash on missing CCM am: 259528f82b -s ours