am 77df9d6e: am d301c904: Merge change I305c181c into eclair

Merge commit '77df9d6e0ca56a34c66a1e30e9696085ddbd9038' into eclair-mr2-plus-aosp

* commit '77df9d6e0ca56a34c66a1e30e9696085ddbd9038':
  Delay 500ms between each registering each SDP record using sdptool.