Merge "Allow advanced VPN to manage connection status via its UI" into tm-qpr-dev am: 63aca8e1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19491096



Change-Id: Id56424de408fca4a14807e29560a5694c4a63705
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>