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