Merge "MediaPlayer2: remove AudioManager private API usage"