Merge "MediaSessionService: Remove unused code"