Merge "MediaMetrics: Update AudioTrack to log the playerIId" into sc-dev