Merge "Stop calling setAlwaysOnPackage from VpnManagerService"