Merge "Add structure for holding Bluetooth OOB data." am: 6815181c0b
am: 801439d8aa

* commit '801439d8aafef69d027ec417919d128a58e1c42f':
  Add structure for holding Bluetooth OOB data.