[automerger] DO NOT MERGE Fix length for L2CAP config type EXT FLOW am: 1fa0f29d am: 066e4011 am: c97a452b am: a2661852 skipped: 3c413e34 Change-Id: I5f0ad541fa702233322b96e5dd5c9d53233dea94