Merge "MediaRouter: Add RouteGroup" into mnc-ub-dev