Merge "Remove the reference of new Network(int) in Vpn.java" am: 4e6166801e am: 228f0d9782

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649306

Change-Id: I630266baca1280575208216151d03502436cca24