Merge "MediaPlayer factory method with audio attributes and session ID" into lmp-dev