Merge "Replace MAX_NETWORK_TYPE with TYPE_VPN" am: 9639cd6242

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

Change-Id: Ib563069788cf575798ae3f0bdc3ba91613035ea9