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

Change-Id: I11ff51cfb79fc490c7a3ff3b6da8844f5cfdd564