am e50c7933: 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 'e50c79337277f9da2c9cef52fd373bbc85df6255':