Merge "Change google operator feature check to Android TV" into android11-tests-dev