am 08b1c8d9: Merge "GAP: Handled collision scenerio with headset" into klp-wireless-dev

* commit '08b1c8d9147c253fecd34686b0c4dcd5b78cc778':
  GAP: Handled collision scenerio with headset