Merge "Revert requestSetProviderEnabled API"