Merge "Skip starting VpnManagerService for Wear devices" into main