Merge "Test if VPN app can grant ACTIVATE_PLATFORM_VPN with CONTROL_VPN" am: 4887b5f98f am: 2d42b4217f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2141573

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