[automerger] Fixed the HCI ACL Header definitions for PB and BC Flags am: 0bb581fb96  -s ours am: d3bed350c0

Change-Id: I7dd994da9e35b5c9981059701bebe854e3043226