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

Change-Id: Ice9c644eb249494102fac76c2da395fda0f962ef