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

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