Merge pull request #8598 from JosJuice/channel-sync-android-tv Android: More robust check for whether to sync channels
