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

Change-Id: Iaf3394d538fa70ffa3baa7c8061dd164afc1cc49