DO NOT MERGE Do not set sig_id in gerneral reject message per AVDTP SPEC 1.2 automerge: 595bcb4  -s ours
automerge: 2369935  -s ours

* commit '236993560aad078736afd36323ed0dafa13005c2':