Merge "Ensure MediaSession is ONLY made active when routed to wired headset." into udc-dev