Merge "MediaRouter: Fix lint warnings" into nyc-support-25.1-dev