Merge "MediaRouter2: Enhance readability of MediaRouter2ServiceImpl"