Merge "Revert "MediaRouter: Check a route's supporting control category"" into mnc-ub-dev