am 31df62ab: Merge "MediaPlayerService: prevent audio_attributes_t race conditions" into mnc-dev

* commit '31df62abf1b1bd45b217f6de7f6ffb503a885b95':
  MediaPlayerService: prevent audio_attributes_t race conditions