Merge "MediaRouter: Add getDeviceType() to RouteInfo"