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

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

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