Merge "Test Entitlement when telephony is present" into sc-dev