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

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

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