[automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: ad4098c3 am: 8ee587af Change-Id: Id0a40d0a6138e05b9038a09751a53a3f6deef786