Merge "Move device default AppError theme to themes_device_defaults.xml for TV and watch UI modes. Minor addition to ag/4994335"