The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/836205fa121cd3ad2c761f9c35f441256e502e14

commit 836205fa121cd3ad2c761f9c35f441256e502e14
Author: lgcheng <lgcheng@google.com>
Date: Fri Dec 08 01:37:46 2017

Fix VPN provider match logic.

When introduce Arc VPN match logic, I tried to keep exsiting matching
logic for third party extension VPN and bult in vpn ASIS and just add
Arc VPN matching logic at beginning. It turns out this will make
mismatching in system tray that built-in VPN are also matched to Arc VPN
provider. Fix the matching logic in this cl.

Bug:  793097 
Test: Bult-in VPN network no longer matches Arc VPN provider.
Change-Id: Ic58fd781e684f402fa7ad6cec5cf24886185b196
Reviewed-on: https://chromium-review.googlesource.com/815834
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Long Cheng <lgcheng@google.com>
Cr-Commit-Position: refs/heads/master@{#522672}
[modify] https://crrev.com/836205fa121cd3ad2c761f9c35f441256e502e14/ash/system/network/vpn_list_view.cc

Approving merge to M64 Chrome OS.

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/7b5835794a8005868aa2987f090c5d202d0ac9f1

commit 7b5835794a8005868aa2987f090c5d202d0ac9f1
Author: lgcheng <lgcheng@google.com>
Date: Fri Dec 08 18:21:03 2017

Fix VPN provider match logic.

When introduce Arc VPN match logic, I tried to keep exsiting matching
logic for third party extension VPN and bult in vpn ASIS and just add
Arc VPN matching logic at beginning. It turns out this will make
mismatching in system tray that built-in VPN are also matched to Arc VPN
provider. Fix the matching logic in this cl.

TBR=stevenjb@chromium.org

Bug:  793097 
Test: Bult-in VPN network no longer matches Arc VPN provider.
Change-Id: Ic58fd781e684f402fa7ad6cec5cf24886185b196
Reviewed-on: https://chromium-review.googlesource.com/815834
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Long Cheng <lgcheng@google.com>
Cr-Original-Commit-Position: refs/heads/master@{#522672}(cherry picked from commit 836205fa121cd3ad2c761f9c35f441256e502e14)
Reviewed-on: https://chromium-review.googlesource.com/817858
Reviewed-by: Long Cheng <lgcheng@google.com>
Cr-Commit-Position: refs/branch-heads/3282@{#99}
Cr-Branched-From: 5fdc0fab22ce7efd32532ee989b223fa12f8171e-refs/heads/master@{#520840}
[modify] https://crrev.com/7b5835794a8005868aa2987f090c5d202d0ac9f1/ash/system/network/vpn_list_view.cc