Merge "Test if VPN app can grant ACTIVATE_PLATFORM_VPN with CONTROL_VPN" am: 4887b5f98f am: 90b955f0be am: 3e66cbf236 am: 92ac012233 am: 8ef70dbc43

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

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