[1.7.x] Fixed #22816 -- Corrected Oracle feature flag and fixed introspection test

Backport of 6122904 from master