Merge "Add owners for VpnManagerService"