Merge "smb-lib: allow hvdcp if pd is disabled"