Merge "Merge "Fixed the HCI ACL Header definitions for PB and BC Flags" into oc-dev am: ad6b1eb846 am: ed2e9b8c20 am: 19e58f648f" into oc-mr1-dev-plus-aosp