Merge changes from topic "am-6595535a-66ae-4551-9774-048441013dbf" into oc-dev

* changes:
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: 10e0027a am: bdceca1d am: 32040fc6 am: f4b98732 skipped: c807bd5d
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: 10e0027a am: bdceca1d am: 32040fc6 am: f4b98732
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: 10e0027a am: bdceca1d am: 32040fc6
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: 10e0027a am: bdceca1d
  [automerger] DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data am: 10e0027a
  DO NOT MERGE: Fix possible OOB when AVDT data channel recive ACL data