[automerger skipped] Merge "Replace MAX_NETWORK_TYPE with TYPE_VPN" am:...

[automerger skipped] Merge "Replace MAX_NETWORK_TYPE with TYPE_VPN" am: 9639cd62 am: b293e99d am: ab0f3875 -s ours am: 006f1a69 -s ours am: 2c89d3e2 -s ours

am skip reason: Merged-In I27579a942a0424db647ad1f3383db78d5a0c69a9 with SHA-1 afdb6590 is already in history

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

Change-Id: I0201b3a2a930e1e349feeebeaea4261da942b61f