[automerger skipped] Stop using ConnectivityManager for VPNs. am: 1434c08600
am: cd7a7d20a1
am: 927ff0169f
-s ours am: 2d6fc470ef
-s ours
am skip reason: Change-Id I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff with SHA-1 5c9a042370
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1592132
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0fa690c1fbc9d738db416e7e3cc7c8d38e81df87
This commit is contained in: