[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
am: 78e68379 -s ours
Change-Id: Ia789078673976b09dc04ec2ff53b211c85b36d9f