Merge "MediaRouter: Remove uses of not-yet-public API" into mnc-ub-dev