Merge "MediaRouter: Fix syncSystemRoutes behavior" into nyc-support-25.1-dev
am: 5ac3ff1595

Change-Id: Idbfd4e5b0e64559a199422416a6bd7098dbb1579