Merge "Change google operator feature check to Android TV" into stage-aosp-tm-ts-dev