Merge "Grant the ACTIVATE_PLATFORM_VPN appop if VPN app has CONTROL_VPN"