Merge "Revert "Test if VPN app can grant ACTIVATE_PLATFORM_VPN with CON..."" am: e87c1e0187

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

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