Merge "Stop calling setAlwaysOnPackage from VpnManagerService" am: 588e1bde6f am: 6135c3b4ba

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2174906

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