critical non-selective query fix for large orgs

# Warning
# Info
* Resolves the issue where organizations with 200,000+ contacts would get a non-selective query error trying to save new contacts with addresses.

# Issues
Fixes #1225 
The condition "Account.npe01__SYSTEM_AccountType__c = :CAO_Constants.HH_ACCOUNT_TYPE" was obviously added to fix that test that was failing. There's no need to another condition like this in the second part of the query (the another side of the "or" clause)?