am b357f271: 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 automerge: 0570fd9  -s ours

* commit 'b357f2716532f878be85ffb639b9c1ea2a6d3048':