[automerger skipped] Merge "Remove the reference of new Network(int) in...

[automerger skipped] Merge "Remove the reference of new Network(int) in Vpn.java" am: 4e616680 am: 228f0d97 am: 6a35ea2e -s ours

am skip reason: skip tag Change-Id I4176dd1298ad8d8e8407eb95b2e6cbb8faf4bc17 with SHA-1 afd9acdb is already in history

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

Change-Id: I493bc4996795d605ea72cdbb61617470b0430ffb