Merge "Do not perform SDP during pairing" into lmp-mr1-dev