Merge "Switch SystemUI from IConnectivityManager to VpnManager." am: 0b303f2d15 am: c30b637f54

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1c58ca03094df88edd510c47c060dc2b29c127b