am b40c0b5a: Merge "Handle wakelocks for device connection intents from AudioService" into jb-dev

* commit 'b40c0b5aa5df14fa5c5ff0ca2012307fc56fb38c':
  Handle wakelocks for device connection intents from AudioService