Merge "MediaRouter: Add missing info to MediaRoute2Info"