[automerger skipped] DO NOT MERGE: Fix possible OOB when AVDT data channel...
[automerger skipped] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: a61ec567 -s ours
am: 5de63bf9
Change-Id: I0b52641f0290b4b3e6a08f706baa72894da7b93a