Merge changes I0fef0584,I322b91fa

* changes:
  AudioPolicyManager: return output for audio attributes
  AudioTrack construction with audio attributes