Merge "Test Entitlement when telephony is present"