Merge "Revert "MediaRouter: Add SystemMediaRoute2Provider to publish default route""