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