Fixup operatorCheck for Note3

Change-Id: Ia8de8312e088b7c4dd98e8d6084313b5f46731fb
Merge "Fixup operatorCheck for Note3" into cm-10.2
Merge branch 'cm' into HEAD