Merge "Add VPN UT and CTS into presubmit" into main am: 0b0bc526a5 am: 914ad29f61 am: c1279ec2fd

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

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