Merge "Revert "DO NOT MERGE Proper construction of AVDTP general reject message"" into nyc-dev
am: c0811609
* commit 'c0811609':
Revert "DO NOT MERGE Proper construction of AVDTP general reject message"
Change-Id: I180dcc5e72104217af72311be8b1eb0bb38464d4