Merge "MediaMetricsService: Restrict session ids to those from MediaMetricsManager" into sc-v2-dev