Merge "Check for FEATURE_TELEPHONY instead of CM"