Merge "MediaRouter: Minor change to keep consistency with framework MR." into mnc-ub-dev