Merge "Dedup MediaSessionService foreground service handling code" into main