Merge "MediaRouter: Add route groups" into mnc-ub-dev