change order of checks for adding the border color#286

njogz wants to merge 2 commits intomastermedic/cht-android:masterfrom

fix-border-color-on-ungranded-training-appmedic/cht-android:fix-border-color-on-ungranded-training-appCopy head branch name to clipboard