Merge "Merge "AudioService: device connection intent: never send null action am: 87a264dfde am: 305151cbae" into oc-mr1-dev-plus-aosp am: 6add8982cb"