am dabb19fc: Merge "Increase the setup-sdp delay to cover for all the devices." into jb-dev

* commit 'dabb19fcd1b0d7b2c21be37aa0b75df5e35f1d6f':
  Increase the setup-sdp delay to cover for all the devices.