Merge "Introduce ServiceImpl for MediaSessionService"