Merge changes from topic "bt-a2dp-fix-state-machine-timeout"

* changes:
  A2DP: Make sure CONNECT_TIMEOUT is scheduled in intermediate states
  A2DP: Simplify debug log mechanism