MediaRouter: Fix syncSystemRoutes behavior am: 6adc8ba4e1
am: a577233e74

Change-Id: I93f6b0db6aca3f404791262e1294f4405a0f2643