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

Change-Id: I031c1a1e2bc6b082e69dc38746fa270a384ec4f7