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